Bug fixes, implemented back button