Clean up. Add some css