Fixed the toolbar position

Ignore the first commit 83d48ba