Final Changes v1, xhtml --> jsf

Removed classes

Please make a final check on the website