Faces and save button fixed