added some basic html templates
updated merge issues