Adding all buttons leading to the color highlight filter. Refactoring the FilterActivity. New tests included for all these changes
Removing old file
More refactoring for better design