Preview functionality updated
Minor changes