Feature/new ui