Some visual Gui changes. (needs to be tweaked)