moved databaseEmpty and design changes