Js and minor styling fix