Small changes to GUI
Funtionality improved