Pull in scructural, style, and layout changes from UDB