indentation fixes
changed to more compact organize view for database items
Merge branch 'develop' into testing