Improved performance when changing pane, modified layout a little bit.