Design fixes.

Fixed~~~~!!!!