fixed html validation / added pagination