Improvements to overall ui
Better example overall