Add personal page
Solve some conflicts in application controller