Better class names and narrow viewport support