Added nice styling and information
Fixed conflict