Fixed relative paths in main layout and added some new templates
Merge remote-tracking branch 'origin/master'