manually fixed conflicts with liv pull requests add styling and index and nav bar