Added small CSS and HTML fixes.  Added some logic to unit tests.