Removed dependency on CardLibUI