redesign
fixes