design issues fixed