Updated modules and created categorized main menu