renamed interfaces and further cleanup in pane