message page and other changes