Added some features and cleaned up server GUI