Added message page
Merged stuff