better structure and some extra links