Moved Edit Choices icon to the right after all