added style and removed null values