Work on controller layout.