HomeActivity refactor