gui: General tidy and refactoring code to make it prettier.