Server support for Clear All. Added button
Merge changes
Fix styles from bad merge