Improvments in Disposition wireframes