refactored: fixed toolbar position