Changed navigation links, merged contact & team to about, updated .htaccess