Merged Simon's changes. A lot of UI changes.
Initial filter commit

Initial filter commit.