DB error and success messages are now shown in message dialogs
Fixed spacing of elements on settings panel
Update changes from master