Made Edit button to be optional