Fix variable naming convention
Breakout sidebar sections to indevidual templates
Add contact-data task