Small style adjustments and template cleaned up.