predefined element presentation
better presentation for FIle references
Merge remote-tracking branch 'github/master'