Changed buttons from field to local variables