Fixed some new design changes
Fixed some new changes