Added full multicontroller support in single app
Minor reformatting