More debug on template loading
Added explicit close buttons to popups