Dropping db fixed state issues (?) and got buttons working