Working on Button Fix