Commit for Issue 4
Addresses most comments for last commit.
TODO: Reduce "greyspace" around CS checkbox.

#5