Update due to latest UI changes