Design changes
Merge remote-tracking branch 'origin/danih_ui_redesign' into danih_ui_redesign