More work on home page
Fixed conflicts