user experience updates, thanks Hima