Modified new template
Custom some module
Fix bugs