Buttons now cleaner