Working on the new GUI