Fixed more design stuff