Fix layout for toolbar
Implement fork button