Added tooltips and additional buttons