Fixed iframe security issue by removing iframes