LayerControl fixes

Couple fixes and remove checks for custom LayerInfos arrays in
Controller.