switch tables to div and improve display
Merge after renaming a few classes