toggle add + fixed layout + bug fix