fixes after revert
added keyboard shortcuts