More formatting and putting everything into tables