Gui improvements

Gui imrovements