modified connection-page & better DAOs