Added additional info and safeguards to UI