Reworked client js files