lots of work on the UI templates