UI change for Edit, minor notes