Fixed awkward control placement