Ticket #1007: changed class names for more generic css
small changes while trying to fix bug