cleanup and more work on the user modal box