Button updates
Minor updates