Introduce lots of UI improvements