Changed edit and delete icons to buttons + appropriate changes in tests