Add code to Buttons page, fix some headers