Made some more design changes