Updated button names and removed conditionals