Add: Profile layout
Fix bug.
Remove: comment code