Finished contact list and some othe cosmetic changes