Update native with some ui tweaks