lots of UI bug fixes from PG and CS