Titlebar, text box and other random fixes
Terminal server tidy up