Fixed DbContext issues, reorganized pages

Fixed DbContext issues, reorganized pages