Did a bit more refactoring and added user icon next to email, just because it looks cool