finished main page
merged