Fixed selected/active/text classes, remove trClass, TODO:cleanup