second commit! more work on UI