needs manager coding convention and button bar updates