Cleaned up header templates
Code moved
Update Header Templates
General Style Changes