Fixed views
Merge pull request #6 from Slavka-JD/develop

Fixed views