Added fade effects & animation options
merge