Update Topics and re-arrange categories to match site