Changed to a class object. Minor UI updates.