Further fixes to workstation setup view controller