Design bug fix :bug:

Fixed some design mistakes.