ULS to master without extra commas and more layout fixes

Change-Id: I1f68e9e3179841e7d7ee9550874cc085c9e92b41