Final additions to buttons