fixing design issues