Improve header for showing username
Lets break everything what was working
Forgot to clean up index.php
Merge remote-tracking branch 'upstream/master'