Develop

ux improvements