Changes to layout and some minor refactors
Merge branch 'master' of https://github.com/krsjan/mapp-at-ifi