Feature/new ui structure