more removing clicks, adding JS