Improved GUI

Generally improved GUI