Settings reorganizatiom + Start image export + Some cleanup