fixed scripts to work with new layout