Added menu and optimized caching