Minor fixes, port to Crud, Image, Settings