Added extra settings and templates
Updated to bootstrap 3