       selectedValue={query.lang} />`
 
   languageAddButton: ->
-    `<button className="btn" style={{marginLeft: 100}} onClick={this.props.handleAddLanguage}>Add language</button>`
+    `<button className="btn" style={{marginLeft: 20}} onClick={this.props.handleAddLanguage}>Add language</button>`
 
-  searchButton: ->
+  searchButton: (isMultilingual) ->
+    marginLeft = if isMultilingual then 80 else 40  # adjust position relative to the language select
     `<button type="button" className="btn btn-success"
-        style={{marginLeft: 60}} onClick={this.props.handleSearch}>Search</button>`
+        style={{marginLeft: marginLeft}} onClick={this.props.handleSearch}>Search</button>`
 
 
   render: ->

          <b>Simple</b>&nbsp;|&nbsp;
          <a href="" title="Search for grammatical categories etc." onClick={this.showMultiword}>Extended</a>&nbsp;|&nbsp;
          <a href="" title="Regular expressions" onClick={this.showRegex}>Regexp</a>
          {isMultilingual ? this.languageAddButton() : null}
          {this.searchButton()}
        </div>
        {searchQueries.map(function(searchQuery, index) {
          return ([

          <a href="" title="Simple search box" onClick={this.showSimple}>Simple</a>&nbsp;|&nbsp;
          <a href="" title="Search for grammatical categories etc." onClick={this.showMultiword}>Extended</a>&nbsp;|&nbsp;
          <b>Regexp</b>
          {this.searchButton(isMultilingual)}
          {isMultilingual ? this.languageAddButton() : null}
        </div>
        {searchQueries.map(function(searchQuery, index) {
          return ([
