Add links for correct views, change somes rendering icons