Add more styling
Add comments validations