Clean-up + added image for active tab in navigation
Merge branch 'master' of https://github.com/matiboy/compargo