last commit of the day
solved conflict
Merge pull request #27 from maximevita/improve-views-and-links

Improve views and links