Implemented correct navigation with keyboard

Fixes #68