further HTML skeleton updates

Please note that grids fall in order only after borders are removed in
the HTML classes.