Fixed Navigation and Added Icons
Merge branch 'master' of https://github.com/smenders/faster-than-pie