Reorganized html and attempting to fix navigation