Added initial support for shortcuts
Fixed some navigation issues