Move reset/clear-buttons into popover, TODO: Add confirmation dialog for the buttons.
Fix merge errors