updated layout per issue #6