Feature/ui

UI stuff