Added fix for button visibility

Added fix for button visibility