Moved some views
Merge pull request #35 from vboginskey/master

Moved some views