Added updated panel
merge cfcontrol