Updated title layout
Work on datafile template
Merge branch 'dev' into test