Changes in GUI and functions