tweaking user pane
fixing merge issues