UI Redesign initial work