Fixed profile view
Merged