continue fixing the new design