Fix few issues around imageview duplicates and width