Added tooltip
Cosmetic changes - buttons