Improve layout
merge controllers