updated lots of client side code for better UI