merged from index, style sheet changes, html folder