Small adjustments

Changed the tag generation - now first name and s name
you can add twitter link with the @ tag