Update existing buttons and add a few new buttons