Reorganisation of the client side programming/functions