Refactoring profile view
Refactoring profile view