Updated add'l layout issues client requested