Optimised the UI a little bit.