Minor changes to management view/model