Made some design changes