Commit updating databaseoperations
Merge remote-tracking branch 'choose_remote_name/master'
Commit fixing layouts, components.