Improve code quality in MainPageView