fixed core controller and default template
merged after geena => gina