Fix theme and javascript to make tableless themes easier

Add/remove references to tags as needed to make it easier to go tableless