Reordered buttons
Added Tooltips