merged user with header
tweaks to header