Cleaned up Signup templates