added back button and smoother animations