Look/Feel changes

Change some class names
Change CSS assignment