Removed caching and udpated menu