Remodeled template for better styling.

Remodeled template for better styling and cleanup indenting.