Updated wireframing and index