Fix image layout
Fix warnings