fix controls order