replaced buttons with toolbar