Update files with the latest version from master, mainly GUI updates