Feature/better ui