Feature/ui changes