rework tiny grid layout improvements