Updating GUI
fixing merge conflicts