Improve layout, use multiple controllers