Refactor Activity views