Several UI improvements & bug fixes