Change more view to lazy views and add lazy object loading