minor changes
changes
Add images to framework pages
Fix conflict errors. Time to sleep