Fix minor design issues