Some changes to DAO and xhtml