Spacing layout somewhat works

Saving so that if I really screw up the tabling layout I can fix it.