Added site ranking, needs testing and some updates still
Merged changes