Design fixes