Fixes gridview under workview alongside layoutViews, moves options from workview to AppView
Merge pull request #31 from kayvon/master

Fixes gridview under workview alongside layoutViews, moves options from