personal page bugs fixed
Merge done