Transitioning to One-page Site

Some rearranging and modified CSS