general reformatting and Cells resource url fixes