HTML5 fixes, grid implementation