Feature/ui update

:lipstick: