Refactored templates
Updated frame positioning
Merge remote-tracking branch 'origin/master'