rearranged photos, cleaned up