Updating client models and component manager to the new layout changes