tweak UI ordering and language a little bit