User interface

Probably should merge with view
Merge pull request #1 from smaknp/master

User interface