merge two sites, and did a bit on restyle.