Initial UI changes
Revert "Initial UI changes"

This reverts commit 20b6c660b335323b176568889a65a310d2fde96e.
Revert "Revert "Initial UI changes""

This reverts commit cc483c68d05c97372f82b8d1fdcf337680d72d76.