buttons, headings fixed, small base changes, some template changes