finished js merge, right sidebar functional