Slight improvements to GUI