fixed the saving for database
Merge branch 'daison-updates'
Merge branch 'ui'
Merge branch 'master' into ui
minor fixes on ui