fix map
fix back buttons