Fix commit + Refactoring of Application Controller