fix bugs, text spacing