massive format refactor / spacing fixes. Preparing for new layout for main page