fixed top margin, navbar, and footer
fixed conflicts
fixed conflicts