design issues fixed!