Implements changes to client side js per Shawn's code review