update for caching, and clean up looks, add navbar