Added caching, and added divs to make view more accessible. HISTORY-2, H...

...ISTORY-29 and HISTORY-30