PROV-278 Streamlined UI; fixed various display bugs