Add template for OSD section
Various configuration fixes