Fix design issues