Improved use dialog handling (still somewhat hacky)