Deleted duplicates, added library for UI