Add camera
Fix conflicts
Fix path t camera page