Add hokk on dashboard and social enhancement
Merge EMH and Extra