A large number of UX / visual improvements and some refactoring