Lots of ui bug fixes around comments