updated with toolbar dropdown