Fixed registration: database and layout