Last changes to fit redesign