more layout fixes

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com