make sure the unique id is set correctly

Change-Id: I1b846e79c2fdd718b7c67f39cb67ca2916520cb3
add teh rounded corners property back

This has been removed because it was unused.

Change-Id: If8fdf87cec1cd5fb5ee1924396643b152e6f3431