Fix whoami layout
Add more content to whoiam