updated new blog and home blog layout
fixed conflicts