Fix flash message and dropdown edit