Improve fit page model somewhat