GUI cleanup, screen size optimisations