More work on enabling/disabling button