Removing breadcrumb
Adding nav bottom border
Adjust header markup and styles
Resolve merge conflicts