Some more changes

*Added back button
*Fixed some bugs