Added better image expansion and viewing