Design fixes fixes fixes