images and start of nav
fixed conflicts