Updated layout to be simpler.