Fixed submit notice redirect error and cleaned up existing templates