Custom Control template improved.