Fixing the bug in the templates
minor changes
fixed merge typo error in settings caused due to the merge
fixed the similar error in settings
database changes