Fix classes when displaying an item
Minor fixes and code cleanup
Merge branch 'master' of github.com:clochix/alir