Finalize main view modal preview linking
Merge branch 'master' into kris