Fixing design issues