Merge "GAL UI cleanup work (in progress)"