Fix modal button problem e.t.c.