Display logic tweaks
Merge branch 'master' of github.com:jyoko/clean-app