fixed design issues