merging and still working on edit btn loop
relatively presentable