made html more semantic
unified services into one