BISERVER-9244 - Made some tweaks to the transitions based on UX feedback