fixed indenting and other link errors on application layout and updated controllers to inherit from the right one