Added headlines and fixed minor issues
Made links to buttons instead