Aesthetic fixes and improvements to server