Update, mainly added modal window