Small code update

Improved code a little

 * Updated jquery events listeners
 * Some CCs
 * use the framewor * use the framework

Change-Id: I4779fe72c6fc93e5ad8cef07da46abac13f7d814
Merge "Small code update"