Main menu setup
Conflicts resolved & TOC added