Add menu class; begin adding title flag