Various improvements, text no longer overlaps