Finalized Keyboard Shortcuts

Closed #36