Multiple changes to bring screen in line with design doc.
Authored by: b_calderwood 2011-08-24
Parent: [r5493]
Child: [r5495]