UI and filter changes

See commit descriptions for further details.