Fixed merge conflicts and issues. Need to restructure action listeners
for the button