updated home
Added navigation
fixed conflict