Background and fill image fields and fixes for image fill functionality