Merge pull request #30 from kayvon/master

Fixes keybindings
Fixes gridview under workview alongside layoutViews, moves options from workview to AppView