Reverted back Surabhi's changes for now as its having issues in Edit button show and hide.