rearrange axis redraw to improve performance
add amplitude and pick-mode widgets to PickWindow