Added some more design stuff