Organized & Added Missing Elements To Main Controller