re-organize and add fancybox changes