Added design stuff