UI and bug fixes for both examples, layout changes.