updated model and pages
some changes
added image and refactored
finishPage and settings