Clean up settings a little more
Fix image references