Better formatting

UI updates, NaN detection