design tweaks
more and more tweaks
Merge pull request #315 from brethauer/design

design tweaks.  also fixes #312 and #311