Add picture button and better errors messages