Refactoring in modal code; Add modal tests
Fix for broken menu on ipad, fixes #25
Server modal fix