Please clean up your code guys! At least separate the two version so people can maintain and customize the template.