Major steps toward finishing Add, Remove, Save and Close buttons