Start to implement add buttons