Fixed some design issues
Release 1.0.6