Shrihari: Removed the annoying from from each button