Template system, Pro screen clean up.