Bug fixed, small views improvements
Merge branch 'master' of github.com:Seravo/Library-Directory