Preformed lots of smal fixes to GUI