Feature/redesign