Images restructed + minor tweaks