Icons, text and other clean up

Covering various issues, including trying out different icons, moving
text
In the process of adding recurrent connections