Header - reorganization & remove welcome / top links