Improving app navigation
Improves the navigation code structure.
Merge pull request #40 from arthurbenemann/issue35

Issue #35 improvements, just to keep dev branch up-to-date.