add image/data + improve main view