Fix spacing, remove TH, re-arrange information