Merge pull request #30 from rmtmckenzie/Morgan

Fix ui a bit more
Merge branch 'master' into Morgan
Fix rest of server message boxes