Refactor some code, make connection in nav a link, better icons