Merge pull request #2 from ZenCocoon/design_base

Fixes, cleanup and design base