Update the order of text fields

Signed-off-by: Antti-Ville Jokela <antti-ville@avjokela.eu>