Various small improvements to GUI