User Interface overhaul - rough draft.