Feature/ui rebuild