removed controller container, merged remaining controller elements into
main layer