Trying to fix ProjectPreview
Fixed merge issues