Updated button IDs