Minor layout revisions

Signed-off-by: geoffreymcgill <geoff@ext.net>