- more UI changes pushed out

- Hopefully better.