* Error text formatting
* UI fixes