merge gui changes to main #297

Closed joelparks112 closed 1 month ago