added UI class
fixed merge conflict
Fix deck looping in interface