Feature/ui improvement