Finished restructuring layout; updated CSS