Merged layout and pane panels. Code clean up.