Feature/new design