reduce another 2n queries to 2 on the homepage
add some icons