changed order of text + changed paddings