Added Images, Refined wireframe