Add text wrapping - Must fix buttons