BHV-1222: Add proper styling for expanded state, clean up cruft.
Merge pull request #1152 from enyojs/BHV-1222-aarontam

BHV-1222: Add proper styling for expanded state, clean up cruft.