Added easier window navigation and fix commentary mapping