42b

fixed conflicts to merge with master. Updated layout with template functionality.