Design update for UMS

by Unmatched Style