improve bucket filters
add "Start over" link
change Project to Context