Stripping out whitespace
Collapse/Expand and small screen changes
Merge pull request #1 from lisacatalano/master

Master