Final updates and templates changes before going live