Basic layout panels update

See issue #5