Add layout to include checkbox and right arrows and we will dynamically
control how they are rendered.