S branch 2

Bootstraps some views and adds a user settings view (from Dickens's branch)