minor site tweaks and testing full screen operation from site
Fixed merge conflict in template.html