Updated layout to fix errors again.