updated for more camera support with seperate crop page