Design tweaks
Merge pull request #2 from rhokbrisbane/design

Design tweaks