Make the UI a bit nicer

Hi this 2 commits make the UI a bit nicer and the code a bit cleaner.

Hope you like it :)