fix bugs after design changes