New GUI updates - almost done