Updating layout, but fixes
Further layout markup