Some fixes: text on images etc