updated some styles, trying to merge