menu bar fix + code cleanup