Add Clear All button and fix errors

Change-Id: Ia11cd7eb9079d5441c738f96e08aaa589fe43b93