fix back button
minor changes