Some refactoring for the first app screen.