Added 30s timeout plus some layout changes