Clean up warning
Update styles
Test