Fix & enhance toolbar position