evening edits, working and some logic to hide links