improve message system's navigation