Merged in basic display logic