ui templating restructure