Less info displayed & more hierarchized

(needs styling)