Updated styling on the index page
Fixed merge errors