Added contacts and fixed navigation