User model changed to allow username
entries added, need to set relations and fix views"