Merged main page

Not perfect