kind of fixed db and changed a button