more UI improvements, more edit/update woe