Merging new gui

And trying to sort out catch curves