Updates to object page. Ready to start linking functionality. Location image still missing.
Fix merge conflicts