Clean up. Added "All Categories..." button