Added remaining fixes, JS for legend