Proper UI
Revert "Proper UI"

This reverts commit 0e76bb5dd9ac6ad8eb6c700edd30d48c7a58e899.
Merge remote-tracking branch 'origin/master'