change in header and user_view