App fully refactored into a parent view