Improved alignment, added word wrap to text