Bug fixes and style changes for limited template dynamic layout.