Add keyboard shortcuts to full screen mode
Clean up duplicate code (some of it at least)