fixed flags on the contact page
fixed flag in messages
fixed the header
fixed conflicts