better styles, new functionality