Changed transition timing and added changes that should allow back button support