Added edit buttons and use icons