First Stage of UI Rehab

First stage of the UI cleanup/redesign.