Refactored again to better handle variable sized adornment images and their containing views. Still need to fix the expand gesture.