Merge pull request #24 from KillaPL/basic_view

Basic view
Merge branch 'master' into messages_cleanup