Refactored HomeActivity