Added lazy load, functionality for expand button, more restructuring.