Feature/units menu bar