Messages refactor fix
Header fixes
Interprise skin