change structure by not using iframe anymore