All design issues fixed