Pushing before I attemp to fix preview placement issues