Refactored MainViewActivity