Updated location of key.  Fixed bugs with button enablenesss