Fix layout of several panels. Some other minor bug fixes.
Authored by: b_calderwood 2011-12-14
Parent: [r5825]
Child: [r5827]