updated SiteMesh and REST controllers