Controls layout improved