Moved ui lib
Proper Nonce
Minor UI change