Minor UI improvements; fixed line break problem so that breaks will not be remove.