Added some validations on Office and Message, got Deals navigable