Updated to use LayoutController