Big cleanup + iframe integration