Fixed merge conflicts
(bugfix) made the refresh work for the user input field and display area
Updated sliders and generator
Updated input fields