Menu small fixes