Fixes several design issues