Changed some css sizings
Fixed merge conflicts
Merge pull request #13 from JessicaTatham/Jess

Jess