user experience updates

smoothing out the user experience