Refactoring Message update page, form etc...