Menu updated, and small fixes in routing and layout