Issue #169  and Issue #198
Remove options pane