Added layouts and DBHandler