Improved heat map UI as well asglobal manifest