Fix bug - was checking for NAN wrong.
Add coordinates to page. Needs to be tested.