more work on UI and content