Updates from contact list
Merge in latest changes
Merge in 0.2.3 updates from contact-list-landscape