Bo update

There shouldn't be merge conflict. Only add my partials and button callback.