Fixing Messages/Users templates and little improvements to others