Fix + social networks
More improvements