Adding menus & fix typography