Added PhotoViewController and others