General CS and WS cleanup
Merge pull request #69 from isaacgrant/contact-page-cs-cleanup

General CS and WS cleanup