updated layout to use new lightweight layout, needs testing though