Design fixes. :D