Tool-tips and buttons added