Added caching and a partial layout
Added caching and a partial layout