Removed bad template
Template for subtracks renamed for better visibility