added mode + formatted buttons