Making the UI transitioning a bit more polished