Fix linebreak issues
Tweak UI