Move emergency info up and other changes agreed with Florence