More Updates

Fixed more errors with the DAO
Updated the view and templates