Adding and editing entities process improvements (usability)