More changes to show layout. Still work in Progress.