Fixed some errors and refactored ContactList