Modified Button code to be based on Label