Added Contact and Safe Names and more styling