Finish navbar icons, add wrapper to Contact