More reformatting and image resize