Rearrange controls as suggested in #19