Added admin check in AppController
extension fix
Restructuring with elements