Adding several styling changes and rearrangements.