Smaller changes of style patches
Lots of changes switching from table to more open structure