Js bottons and other fixes