Moves controls to correct location, resolves #163