Server Improvements and Client GUI improvements