Fixed profile page from merge