fixing markup and scripts