Updating markup and handler functions