Enhancing preview behavior and layout