Fix newlines and user display issues