Create/Change UI improvements
Merged client view