Make some design changes