Refactor tiers db and update tiers view