Use only one source for the APP. Rework the navigation a bit