made some redesign stuff