Template cleanup.
Removed unecessary if blocks.
Fixed duplicate wrap div issues.