GUI: cleanup

Some tidying up