Fix some more bugs and align created texts