Added names markup, font colors
Updated overview