CSS structure changed, HTML classes improved