Completed toolbar, added button for fill.