Improve page nav markup