Making the add_button pretty
Added another test and fixed some bugs