Fixed active menu item issue & added first steps for menu structure