Finished 'hybrid' front page, made small requested changes to several pages