Put help, counter and logout button in one btn-group
To gain some space
Remove some dead code