Fixing up design issues