-Several bug fixes
-Cleaned up some UI issues
Authored by: jstoecker 2012-01-25
Parent: [r80]
Child: [r82]