Refactored iframe loader to directly load content
#142 more refactoring
merge