Merge pull request #66 from coryshaw/master

design tweaks & polish