More Gui elements
cleanup