tidying up menu, adding esi, adding caching