Add border outside image; correct ghost panning