Updated stuff to be more html5y.