Updates to Action Page

Ports back some changes made on the Mustache branch.