Improved lenses. Taken out the action buttons from the internal templates.