Move table style to strapped
Clean up a bunch things