some UI work
little UI work