Added retry button if no databaseconnection
Merge