Quick changes that would make new user experience a lot better

This has already been addressed: