Fixed images issues