Fix settings and add pane limit