Mostly final changes to website