Redid nav bar and added to favorites section
fixed conflicts