General tidying of HTML and fixing of layouts, redone Sigma queries and not using :reportable, changed charting and fixed colour scheme consistency