cleaned up name and edit buttons