Update to layout to take advantage of full api

The client api supports more than what the server api does. This switches things over to take advantage of the fuller api.