styling index page
merged conflict