Client side functional improvements and additions