Changed the way Active/Inactive listings work + lots of code translations