More updates

Basic site is almost converted. Still need to update html files to
templates.