-Moved Server controls to the Main Grid