did more refactoring to the home view