Fix menu helper and some CSS