Cleanup routes/filters, minor UI tweaks