Working layout on client add/remove