fix nav button in firefox
fix tablet displaying
fix merge conflict