Made buttons consistent across pages; fixed images on pages
Merge branch 'tabs-2'