Update to struct and UI implmentation