menu + small fixes