add menu links, removed some (stupid) sass code and markup
Merge branch 'list-messages' into add-new-message
resolved merge conflict