Improve Assign button behavior