Added icons, updated stuff to reflect the new nav