Client Side: small fix  for layout and waiter