[TASK] Further improvements to Image/Textpic elements