New Template and fixes