clean up html bugs and merged all content into main.html