Added some to head bar
Merge conflicts fixed