Code cleanup, Add & Delete list buttons