Added some design stuff