Progress on templating out common controls