Added resources (images and icons) and changed model properly