refactored the view calls in App