Improve header for showing username
Lets break everything what was working