Big cleanup + iframe integration
Fix dependencies