templating & other changes to support the new mockups.