fixing DOM issues 2