Add category split for message keys
Refactor tables with div elements - change css