working on homepage styling
resolved conflicts, added some styling to home page