Feature/ui improvements