Move the client section into a partial.