Fixed a couple issues with remaining git merge conflict code left in the index.html and create.html pages. Fixed layout on manage.html page.