I wonder if having this in 2 elements won't impair localization. @stasm could you have a look please?