Made some design updates