Large changes to peakpicker, GUI layout
quick bug fixes
Merge branch 'beaver'