fixing controls position. see #20