== Current Affiliations ==
-Coordinator of the Infrastructure Team, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
Software Engineer, [[http://www.google.com/|Google Inc.]]
-[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
+[[http://www.google.com/ | GoogleLogoAlpha.png]]
----
----
-Founder, [[http://www.develer.com/ | Develer]]
+Founder, [[http://www.develer.com/ | Develer s.r.l.]]
[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
----
-Contributor, [[http://uclinux.org/ | uClinux]]
+Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+
+[[http://laptop.org/ | OlpcLogoAlpha.png]]
----
-Operating System Engineer (volunteer), [[http://laptop.org/ | One Laptop Per Child]]
\ No newline at end of file
+Contributor, [[http://uclinux.org/ | uClinux]]
+
+[[http://uclinux.org/ | http://www.uclinux.org/images/logo.gif]]